Autogenerated HTML docs for v2.5.0-330-g130be
diff --git a/git-am.html b/git-am.html index 252dca9..e61522a 100644 --- a/git-am.html +++ b/git-am.html
@@ -749,7 +749,7 @@ <div class="sectionbody"> <div class="verseblock"> <pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] - [--3way] [--interactive] [--committer-date-is-author-date] + [--[no-]3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] @@ -911,12 +911,17 @@ <dt class="hdlist1"> --3way </dt> +<dt class="hdlist1"> +--no-3way +</dt> <dd> <p> When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs - available locally. + available locally. <code>--no-3way</code> can be used to override + am.threeWay configuration variable. For more information, + see am.threeWay in <a href="git-config.html">git-config(1)</a>. </p> </dd> <dt class="hdlist1"> @@ -1150,7 +1155,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-07-27 13:41:41 PDT +Last updated 2015-08-12 14:58:45 PDT </div> </div> </body>
